[automerger skipped] Merge changes I1d1f0d2d,Ifbd4a978 am: c4f2a30c am:...

[automerger skipped] Merge changes I1d1f0d2d,Ifbd4a978 am: c4f2a30c am: 6c13a37b am: 90a9b2d0 -s ours

am skip reason: Change-Id I1d1f0d2d456003e842ad77519667c0532995610d with SHA-1 af4e6b7c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfc985eb18b73d11c07c084a32520b4661aef198