[automerger skipped] Merge changes Ifc3708c1,If07045c1 am: 61c79dbc8d am: 41fc427c40 am: be9cdaf9c9 am: a4223d6142 -s ours

am skip reason: Merged-In Ifc3708c16ae7cf4d7ff26eac0ba1c6fbeb7ed7d9 with SHA-1 92a5ee9bca is already in history

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

Change-Id: I59514d8b034e1387fe2a3efcf9ad7a213c3e5f62