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