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