tree e1a46cf0f2f9a05f56b1ea53c580e64006c6a33e
parent 23d8d8d06339b0013513d18811b250943ab0c03a
parent f40ce119f8c41e05b6a25b3c3ca4f4402b12c3dd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664906821 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1664906821 +0000

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