Commit 1ad4bcb4 authored Mar 08, 2022 by Xin Li Committed by Automerger Merge Worker Mar 08, 2022

[automerger skipped] Merge Android 12L am: 7e916e36 -s ours am: dcc896ef -s ours

am skip reason: Merged-In I2bf469307acd968bf4faa789a9325173d6351c1d with SHA-1 19929dff is already in history

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

Change-Id: Ibc9806af5e848db5f3c3fa1a7a41dad3185e522d

There are no changes