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