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



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

Change-Id: I8a72988f2fb3560565f81deb5f9cd40d1e55e295

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



Change-Id: Ic5043530a403830c0cb89bd7eedc7a67accc1c70
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/+/2765506



Change-Id: I796096b791046edb70b3e9be2642d76abc59cbc0
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/+/2765505



Change-Id: I802c7250b18c0e007482bcfc5f181b0438d06525
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/+/2765508



Change-Id: If82d166c44c80a7db2b49de4d0153325ee01f853
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/+/2765507



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

Change-Id: I54b07b44c23f7a8cb7e2aba9d731c5e7c431247c

Change-Id: I5d0646411d53a7390dca746cba79ae69bd0ec2f5

Change-Id: Id1ff659b4a5ae7809804bacda0a77ccf1815480c

Change-Id: I427112e2986377f37b85d9dfe21620ddd6bb198f

Change-Id: I6836ef908a8482352d5368e4ba2538dc7de0946d

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



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

The target list of enforce_permission_counter can be reconstructed
based on the dependencies of the "services" module. Add the ability to
soong_lint_fix to collect and parse module_bp_java_deps.json which
contains the dependency list.

SoongLintFix is split into 2 classes: SoongWrapper and SoongLintFix. The
former is used as a general wrapper to invoke Soong and parse the module
files. The latter, a subclass of SoongWrapper, contains the calls to the
different steps.

The building and loading of module-info.json and
module_bp_java_deps.json is now done dynamically whenever required.

Bug: 298285238
Test: enforce_permission_counter
Test: lint_fix --no-fix --check AnnotatedAidlCounter --lint-module AndroidUtilsLintChecker services.autofill
Change-Id: I781e9cdf80feb4c4d480673e044d526c528f8412

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



Change-Id: I95cb75395ddf919e78b3ee00ee6fa486a5115a5c
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/+/2636313



Change-Id: I42385d41b0b6b021f5a80f3dcc8f47219fda17f6
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/+/2745856



Change-Id: Ib478de512743d6079682495b45df1bd05d46b391
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/+/2733037



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

Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future

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



Change-Id: I72e5ba5c4ad6f64cd64a10de0a25da5c1fca2e50
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/+/2761566



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

* changes:
  Guard the death recipient behavior behind a build flag
  binder: fix death recipient leak for apps targeting >= V

Bug: 284266229
Change-Id: Ic0453611147ca1a327a150f0ffc92b9cd60b86b1

Rename some methods to avoid confusion.  No change in behavior.

Test: presubmit
Change-Id: Id765f7fa587e2a333ba3e0e649f3d5ab69961e5c

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



Change-Id: I8955771036c93e8e33bf8e50c76ce8ddb35bff57
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/+/2756400



Change-Id: Ia3c61e131d333ad37eb391196ba06210ccfb6983
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/+/2756399



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

* changes:
  Add api_surface prop to non-updatable droidstubs
  Replace api_files prop to api_contributions
  Remove non-updatable contribution from android_test_stubs_current_contributions