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