DO NOT MERGE am: 8d55249939 am: 43cbd91b11

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2843795

Change-Id: I7c870ea1c14fede7d1a79fc3a84dd1c27f91fb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>