[automerger skipped] Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ... am: 7e226700 am: 58d04c0f am: 139eb8fe am: cf6f5c2d -s ours

am skip reason: Merged-In Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf with SHA-1 ecf9fc3c is already in history

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

Change-Id: I48324b3bfc5077a21848ec5b20c2127d2733c857