Auto-generated-cl: translation import
Change-Id: If955fd4971487d0fae58b75fe48c9ed6ff3ac506

Auto-generated-cl: translation import
Change-Id: I51e9f9ed682e4f13ec1577f8c36c33d272c9c6bf

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



Change-Id: Ie4bdce368be2be96272e005215525c59ed6d1681
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 am: 499e70cc am: d974f621

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



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

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



Change-Id: I92b14d5740916b202c330670bbb432247385180a
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 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 am: bf624d54

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



Change-Id: I99b0be9a800ee1397dfd1e62b26547853aba370c
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: I87c6a52cc6d0496f1df6f718fe859759ebffc93f
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>

Currently, metalava will discard concrete overrides of abstract methods
from the API signature files which causes problems when attempting to
generate stubs from those files and also discards information that may
be important in API reviews. This change is the first step in the
process of changing that behavior.

This change hard codes the current behavior for discarding the concrete
overrides (`add-additional-overrides=no`) into those signature files
that will (or are likely) to be affected by the change in behavior.
That allows the default behavior to be changed for all the other files
without affecting these.

Follow up changes will remove the hard coding from the signature files
and will update the contents which will include the concrete overrides
of the abstract methods.

More information and the background for this change is available at
go/add-overriding-one-pager.

Test: m checkapi
Bug: 299366704
(cherry picked from https://android-review.googlesource.com/q/commit:48379f815d43560db37c7291fbfb29cfa06e865c)
Merged-In: Ibe0dbfa29f88d1040798ae394e8d456436259aea
Change-Id: Ibe0dbfa29f88d1040798ae394e8d456436259aea

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: 791de7cc -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: I02918a6151c26305b08992ac6ecea364a30b3c69
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: 8f33f06f -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: I4471c1f201a34efd1d9e66ed12d1fee7abc58c45
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: 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: 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: d5437e1b -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: I8ba112335a3dfb011e9fb7925e26e6ce53f78862
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: 79331032 -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: I7fb19659598ec85df8b456dfb8e3eb9573c16f1c
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: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours am: da091d75 -s ours am: bb78c231 -s ours am: ad5236f0 -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: I8e6cf23903699b7b2327aa1dd2b450a251dd4c35
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: 2380e1dd -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: If8f57b45b1d59bc0d69f088e425b5595b418c9f3
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>