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