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



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

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



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

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



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

This reverts commit 9e87fc38.

Reason for revert: This change is not required now (aosp/2815393, aosp/2831370)

Change-Id: I77d5f3047f4f4ec656d6ba3d2c0781578572f8e4

Some improvements in Metalava's revealed an issue with missing
`@NonNull` annotations on 2 parameters of the `BaseRecordingCanvas`'s
`drawDoubleRoundRect()` method. They are present on the overridden
method but not on the overriding method. This change adds the
missing annotations.

Bug: 307926200
Test: m out/soong/.intermediates/frameworks/base/api/api-stubs-docs-non-updatable/android_common/metalava/api-stubs-docs-non-updatable-stubs.srcjar
Change-Id: I090c3f749e6ac2321d59189f5ec1a4f27179dd82

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



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

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



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

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



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

Add current perf team members shayba@ and jdduke@, and remove
former members jpakaravoor@, balejs@, and cfijalkovich@.

Test: N/A
Change-Id: If786fa38bc5f86d9e64b1672bdcf5e8cde178aec

Bug: n/a
Test: n/a
Change-Id: Id0f1a76eb470e47d28bd40dc4c42c648272b4a27

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



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

Make the function name match the function behavior.

Change-Id: I37b07fdd21d11ec9e19646bca5b2019a6e8e913a
Signed-off-by: Bart Van Assche <bvanassche@google.com>

Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main am: 39c4a124

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



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

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



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

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



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

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



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

Changes of this @hide API seems to be causing failures in existing CTS
tests (was changed in aosp/2636313).

Bug: 308058278
Test: atest CtsNfcTestCases
Change-Id: Ic6a93fec37c133c6e5b861872137ea579ad131f2

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



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

The underlying network and linkProperties parameters are
removed and no longer needed to pass from the callers of
startLegacyVpnPrivileged.

Remove the unused parameters and update the callers.

Bug: 161776767
Test: atest FrameworksNetTests LockdownVpnTrackerTest
Change-Id: I73f30778bb09a67f5b6d03f416627f6331eec67e

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



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

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



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

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



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

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



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

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



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