Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3093660



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

Aosp-First: No
Apex-Size-Increase:
Change-Id: I49671a41c3a38c47902c2a500a0bcc5188ae90fd
Previous-Platform-Support: yes
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3090405



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

Change-Id: Ifeb5d01e159327e3ee94882f8036dba03e6151c9

Bug: 337098550
Merged-In: I536de53d09c7013ba676d56e2a9af226a1b20973
Change-Id: Ic8cbdc7859d4b73af1606ebb85e739a9fd4fa4f0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3073096



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3079326



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

Change-Id: I321d2c02be24c6a756134ddaec6bb22e6f619f62

This CL reverts commit c978d8fa.

Bug: 332594828
Test: treehugger
Change-Id: Ib5245ad08e80da5ac38433398105e9ea5b1f7325

Merge "DO NOT MERGE: Remove com.android.location.provider in aosp_mainline_modules" into main am: 94b86641

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3059802



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3059802



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

Because it is unintentional added.

Bug: 321000103
Test: build
Change-Id: I419ed482592f0915d027519873c595aa42db79cf
Merged-In: I419ed482592f0915d027519873c595aa42db79cf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3061873



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

Revert submission 2675705-use-prebuilt-libcxx

Reason for revert: breaks some Android tests (b/337120479, b/337121737, b/337122511)

Reverted changes: /q/submissionid:2675705-use-prebuilt-libcxx

Bug: 337120479
Bug: 337121737
Bug: 337122511
Change-Id: Id07266de2561be6502e37ffda84890a0d55942cf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2676296



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3061702



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

Also remove mattcarp.

Change-Id: I9c9fd727042a6863f54a31883196dbdd9035dcf4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423



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

https://r.android.com/3035972 delegates dexpreopt of the sdk_library to
its implementation library by creating the apex variant of the
implementation library module. Therefore, the apex variants need to be
added to the allowed_deps.txt entries.

No-Allowed-Deps-Check: build changes
Test: m
Bug: 332785297
Merged-In: I48e02f254129abbe41e07f25684fde2af0949089
Change-Id: I48e02f254129abbe41e07f25684fde2af0949089

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593



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

Bug: 328444881
Test: m
Change-Id: I6861838c626a995c70ee43e2037e6dc105b2ff1a
Apex-Size-Increase: 0 until dependencies are used; analysis forthcoming in b/336579781
Previous-Platform-Support: yes
Aosp-First: yes
Test-Info: tests exist for each independent dependency

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



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

We're trying to build Android system image which is defined in
Android.bp. It's cumbersome to set visibility for every apex module. So
define an aggregated module for mainline modules.

Bug: 321000103
Test: m nothing
Change-Id: I3fb278feaa015ecbe3bb3a38440561533af8ad46
Merged-In: I3fb278feaa015ecbe3bb3a38440561533af8ad46

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072



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

framework-permission-s is currently being depended by the following
modules:
- test_com.android.permission

android.net.ipsec.ike is currently being depended by the following
modules:
- com.android.ipsec
- test_com.android.ipsec

No-Allowed-Deps-Check: Preexisting dependencies
Test: m
Merged-In: I19c529b2fe030664037a4534d8609a04a49014e8
Change-Id: I7f8c5ae7b9ae054652b1463c3e90aa46206e4c01

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613



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

Apex-Size-Increase: 37 kb
Previous-Platform-Support: No
Aosp-First: external dependency
Ignore-AOSP-First: Need update AndroidX in main first to avoid conflict
Test-Info: existing presubmit tests

Bug: 322508920
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96b72f65d7cf85f6978db2798b05f5bebae31866)
Merged-In: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5
Change-Id: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3023363



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

Bug: 331409973
Test: N/A
No-Allowed-Deps-Check: no-op refactor
Merged-In: I456b8f26a56f391c33f69233e86fdc13184811e7
Change-Id: I456b8f26a56f391c33f69233e86fdc13184811e7