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