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