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