[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8 -s ours am: 60207dea -s ours

am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 1315f110 is in history

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

Change-Id: If52b26f3960edac6e4849339b2bcb8e4a1b9dad8