Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc

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



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

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204

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



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

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110

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



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

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3

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



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

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591

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



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

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



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

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



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

This reverts commit 18a2f95b.

Reason for revert: b/304531493

Bug: 231476072
Change-Id: I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50
Merged-In: I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours am: f3223db6 -s ours am: 9c1d125b -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours am: 3e968b7c -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours am: f3223db6 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours am: d3416792 -s ours am: 28dd81c7 -s ours am: ff71a529 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours am: d3416792 -s ours am: 4d61230d -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours am: d3416792 -s ours am: 28dd81c7 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours am: d3416792 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours am: d3416792 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours am: d1e4df2e -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours am: c77e59d9 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours am: da091d75 -s ours am: bb78c231 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours am: 601949e4 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours am: 6e89935d -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours am: da091d75 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 3ab14638 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 edb1e78e is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

Bug: 295335110
Test: Test app with long component name
Change-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
Merged-In: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 0f1b69be -s ours am: 25ebd082 -s ours am: 332dca40 -s ours am: 91a89723 -s ours am: e6e8741d -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 6f5fc7f0 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 0f1b69be -s ours am: 25ebd082 -s ours am: 332dca40 -s ours am: bc94f1b5 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 6f5fc7f0 is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 0f1b69be is already in history

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



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

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 0f1b69be -s ours am: 25ebd082 -s ours am: 332dca40 -s ours am: 91a89723 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 6f5fc7f0 is already in history

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



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