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