Merge changes from topic "am-c287c9cb63d845718e3905cd73c3726b" am: 1c4bb0ec -s ours

am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 8c8d787b is already in history

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



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