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