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