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