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