[automerger skipped] Merge changes...

[automerger skipped] Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208 am: c66289eb am: 0d9a4559 am: 62f75bd1 -s ours am: 86fe361c -s ours

am skip reason: skip tag Change-Id Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c with SHA-1 ffc912da is already in history

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

Change-Id: I5750b2c5f7e2ab52bf29720a110cb154a6815d67