[automerger skipped] Merge changes from topic "am-6536fbd208254e239fdf1c5f73de469e" into tm-dev am: 0fa33957 -s ours

am skip reason: Merged-In I2bf469307acd968bf4faa789a9325173d6351c1d with SHA-1 19929dff is already in history

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

Change-Id: I3e3125e6de505eb76223e78deb748586ad2fad4f