tree 34b42a72382ed04d7dfd80c54e8a56f136c30920
parent 4337e318f5939b642d46bbccd48a65107e0834cd
parent a81c368499cff72a599154bc2f0e75d697279bc5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654564978 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1654564978 +0000

Merge "Merge cherrypicks of [17614692] into rvc-platform-release. am: ce02568a14" into android11-gsi