tree 12faeeedd456996b68c601ef971170878dd84293
parent 775283a584308a03db8352d0700278133a07f45e
parent 0853289f4e96d2f8519b7177b231feb0da1f0928
author Varun Shah <varunshah@google.com> 1689117596 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689117596 +0000

[automerger skipped] Merge "Update parcling logic for Uris." into udc-dev am: f01bb30e8d am: 31ecad8ae7 am: 78127b20d3 am: 0853289f4e -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 a28766a56c is already in history

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

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