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