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