[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: ab29b767 -s ours am: 5b049490 -s ours

am skip reason: Merged-In I04913ce45215927a413bad4828e997ff22ca30b5 with SHA-1 25334d16 is already in history

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



Change-Id: Ic0db42b0348763d72ec57b621983a904ecdb158f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>