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

am skip reason: subject contains skip directive

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

Change-Id: Ic4ab6b82aa7b75120fbbfe0b96da8fb2f55a0c1c