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