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