tree fc502c6f6b0c082c87cbe9c2ecefc94b57ec79cc
parent 9ac0366f6da3dfdfab7ee8c317ea0e4ca7001dc0
parent 2e4ea90e3c1a0933afd323e0c625519d798fed76
author Xin Li <delphij@google.com> 1639517051 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639517051 +0000

[automerger skipped] Merge Android 12 QPR1 am: ab05e3b7d6 -s ours am: 2e4ea90e3c -s ours

am skip reason: Merged-In I57cf9a80e074b8b9603d38396d111b372fae9737 with SHA-1 dd141c62ce is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1921805

Change-Id: I7fe6a3ef89867d19908bc4022bf7aeae59969316