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