tree 58fdc3a4fc8d28cb68c63ca292e78afe14dfc745
parent cb07111e4d62638e73627a68d71b6511219bfdbf
parent 262819d1cab2a8a35aafdf800c2bcef1af8b7452
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659390468 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1659390468 +0000

Merge "Merge cherrypicks of [17591709, 18766114] into sc-platform-release. am: 8455185d1c" into android12-gsi