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