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