[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into...

[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into stage-aosp-master am: d0a33a5a -s ours am: b5ee9215 -s ours am: 35c1f4d4 -s ours am: f782c87f -s ours

am skip reason: subject contains skip directive

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



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