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