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