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