[automerger skipped] Merge changes from topic "compos-cherry-pick" into stage-aosp-master am: 9ade5e2f am: 631842eb am: 9dc21480 am: 332347aa -s ours

am skip reason: Merged-In Ie2e01b01690a5882574282f3158e454a9b6056e7 with SHA-1 5ac0ee82 is already in history

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

Change-Id: I5188054f4c26e58c57d39eaf65c79eee2751f959