tree 6dce446b5bcdf8ee983968524a3547d8ee3db5c2
parent 9c8314454d2b5aab7e847f37435cc81a278da6ce
parent e13ad5fc634c71952c1b628d8b033d4ddd0cc675
author DesmondH <desmondh@google.com> 1683138322 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683138322 +0000

Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 6beb06813e am: e13ad5fc63

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7250/media/+/22520306

Change-Id: Ic2731a547453eb1bd55a763cdaf058187f4b6f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>