tree 6dd85d324101be5fc95c4eefd77c819903a938c5
parent 5a6005fad4414c2122290b087e2e9e8292598c05
parent bce35c5fbc6b963f7606a1115f540de1b0c10c8d
author Jordan Demeulenaere <jdemeulenaere@google.com> 1690801692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690801692 +0000

Merge changes I9025a0a3,I48a1d380 into udc-qpr-dev am: 77bfa87487 am: bce35c5fbc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24240249

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