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