[automerger skipped] Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68 am: 4973cc90d9 am: 57ce3e2203 am: 932b4b9135 -s ours

am skip reason: Merged-In Ie9fb547e166e6c881dfd04383050375a11f84a9b with SHA-1 1a07c53231 is already in history

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

Change-Id: Iff4c792d0f56ce69f89b7f93f31588ed5d1f5ff3