tree 0f42e9a6d0bf425822c6ca0fa52fe3f2d325973c
parent 31b17743b0dd960106ede580db4cc40d9f82c42f
parent a5f2295da6bfa4ddf45e04da234cd5630b8eb4de
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657137505 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1657137505 +0000

Merge "Merge cherrypicks of [17649501] into sc-platform-release. am: ef7a31190a" into android12-gsi