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