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