[automerger skipped] Merge changes from topic "bugreporting-aosp-sync" am: 8fafabfed1 am: 111f411617 am: 2c51591cc8 am: 3005422d62 -s ours

am skip reason: Change-Id Ie926eefacb659cce4c54f42b0835308da5a71bba with SHA-1 572ef12b3d is in history

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

Change-Id: Ib32b0565b6bf5a9104debf209ee9b5e2a84edcfd