[automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca -s ours am: 70ad24f2 -s ours am: 607f8a24 -s ours

am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001a is in history

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

Change-Id: I0cb8f3a8d34fb46ed5c4dd1487589b47cfdec784