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