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