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