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