tree f744e72e6b69e4f025c00dc46d18714efe110215
parent 5381e22aa2806b756df035ce80f8930545cd6dbb
parent b1618ade8df363f72e0089af8fd945dfa4359846
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1691691669 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1691691669 +0000

Merge changes I3f89a3e1,I4a5397d3 into udc-qpr-dev am: b1618ade8d

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

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