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