[automerger skipped] Merge "Merge TP1A.221005.003" am: 534ff49f am:...

[automerger skipped] Merge "Merge TP1A.221005.003" am: 534ff49f am: c0dd2f7a -s ours am: aef79505 -s ours

am skip reason: Merged-In I6ffbb7510e6854f18bc427d1ae1e782918c799dc with SHA-1 7f2bb15f is already in history

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



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