Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321346 Change-Id: Ic44161850db5357784d37a357058deaf3dec0e3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>