[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513" am: bf901995 -s ours am: 57003636 -s ours am: 9e9085f7 -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6 is already in history

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

Change-Id: I12e1b21fed5c252f27fe5b15757a7d811852dbaa