[automerger skipped] Merge changes from topic "am-b9bb3c40c61b4cbba1e851ec557ba733" into tm-dev am: 5721ce81 -s ours am: 054cb9f7 -s ours

am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 6843c124 is already in history

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

Change-Id: Ie0391df20ffca9eacbdb071d1d926de78f21d50d