Merge changes from topic "am-039e403088cd4f18a656c3a5d89a8981" am: cee5e47a -s ours

am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 5c9a11c1 is already in history

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



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