Commit 3f18321b authored Sep 12, 2022 by Bill Yi Committed by Automerger Merge Worker Sep 12, 2022

[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 6f4e679b -s ours

am skip reason: Merged-In I3f9a35cbcb4b5c93c16e9bef04739e5cdbd7ddd4 with SHA-1 3dd9282b is already in history

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

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

There are no changes