[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c0 -s ours am: 84e86143 -s ours am: 92b4b0f2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I232428ea53113f751280df92bbf77fb7a74d9070