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