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



Change-Id: Ifb49a8fcf9d4fb473fd4fd57854587d0e5d2eb7b
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/+/3069906



Change-Id: I81096ba1be157eaddd22b19d14fc919162c0c843
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/+/3093660



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

Temporarily add `libjni_legacy`, an alias for `libjni` during API transition. am: 22e68778 am: ec26a677

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



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

Temporarily add `libjni_legacy`, an alias for `libjni` during API transition. am: 22e68778 am: 8824a093

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



Change-Id: Ibf2b4053fb73c0012f33f397f406d585f2ec9592
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/+/3090405



Change-Id: Ice2f0eb63ff5218a31dfad20af08c64088a42acd
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/+/3090405



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

VIC has been marked as REL in some release configs. Update the
allowed_deps SDK version for minSdkVersion:VanillaIceCream entries to
also include minSdkVersion:35, so the build doesn't break regardless of
the release config used.

Apex-Size-Increase: 0 kiB
Previous-Platform-Support: not a new dep, just new SDK versions
Ignore-AOSP-First: VIC finalization happens on internal branch
Bug: 340992609
Test: treehugger
Change-Id: I5233bd046e64c1f0af85662a0df99c83bf6ee0fc

Change-Id: Ifeb5d01e159327e3ee94882f8036dba03e6151c9

Aosp-First: This is only re-naming the flag
java_aconfig_library
Ignore-AOSP-First: TODO (can we ignore aosp first?)
Apex-Size-Increase: None. This is only re-naming the flag
java_aconfig_library
Test-Info: This is only re-naming the flag
java_aconfig_library
Previous-Platform-Support: This is only re-naming the flag
java_aconfig_library

Bug: 336313566
Test: All existing automation tests
Change-Id: I30aaf586f1df1a3284372292001f2f2c146e2af3

Bug: 337873972
Apex-Size-Increase: n/a - flag definition
Previous-Platform-Support: yes
Aosp-First: internal
Ignore-AOSP-First: associated change is being tested in internal before going to AOSP
Test-Info: flag only

Change-Id: Iaa43bd0911db795151fc9585b2684c708cd1b935

[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 2cfbc1f3 -s ours

am skip reason: Merged-In I536de53d09c7013ba676d56e2a9af226a1b20973 with SHA-1 6c1e5d8a is already in history

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



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

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 183b3b10 -s ours

am skip reason: Merged-In I536de53d09c7013ba676d56e2a9af226a1b20973 with SHA-1 6c1e5d8a is already in history

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



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

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

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



Change-Id: Ib4b1266d9cbbfae6637f6ba1a84f50c5133e9d04
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/+/3073096



Change-Id: I6f2d4800825d08675df137b2e41c3f155819597d
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/+/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/+/3073096



Change-Id: I5a5904510bf5ad80c9e286a845011c0a2067f224
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: Iab06fea22ab897d1d3959cc04b25fca75b039a13
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: Ic21de1956990c5d2ff1201ffeda939488b23fe89
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>

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



Change-Id: I14c20b7f72650527a5d7cfdf099d435d796367fe
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

am skip reason: Merged-In Ib2d6097eaed4c77fc5a3aea9c2986cfdb7dfb08b with SHA-1 50e2a0a4 is already in history

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



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

Bug: 322515720
Test: manual

Apex-Size-Increase: none
Previous-Platform-Support: yes
Aosp-First: internal
Ignore-Aosp-First: internal
Test-Info: manual
Change-Id: I7e860dde4205596ca9598d72c985c5b8d8dca1cb

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



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

It was not added intentionally according to
https://googleplex-android-review.git.corp.google.com/c/platform/packages/modules/common/+/27116799/comments/a9698d06_ccdd789e.

After removing it and running
packages/modules/common/build/update-apex-allowed-deps.sh the
dependency was not included again, so I concluded it's safe to remove it.

Test: packages/modules/common/build/update-apex-allowed-deps.sh
Ignore-Aosp-First: internal source
Change-Id: I3a7243401181e51cc04b0c8b7b2fd273219fcbb2

Update dependency due to Jetpack library update.
Apex-Size-Increase: 33.7KB
Previous-Platform-Support: 19
Aosp-First: No
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects
Test-Info: presubmit
Bug: 322508920
Bug: 329997430
Test: presubmit
Test: verified with ABTD https://android-build.corp.google.com/builds/abtd/run/L30400030003545724
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:50e2a0a4068e1ea962aa2857c0b05027b29167c3)

Merged-In: Ib2d6097eaed4c77fc5a3aea9c2986cfdb7dfb08b
Change-Id: Ib2d6097eaed4c77fc5a3aea9c2986cfdb7dfb08b

Currently the libpdfium is added as a shared library dependency to libpdfclient, this CL is to statically linking to decrease the apex size.

Ignore-AOSP-First: This change is regarding a new development inside mediaProvider module
Test-Info: Library has its own test.
Apex-Size-Increase: N/A
Aosp-First:No
Previous-Platform-Support: Statically linked libpdfium with libpdfclient

Bug: 336199545
Test: m
Change-Id: Iaabcb833b552004d933d806bd0c52dd7f70e6bf3

Apex-Size-Increase: 50k
Previous-Platform-Support: Yes
Aosp-First: Yes
Test-Info: build and verify the channel sounding function on devices.

Bug: 338259287
Test: make
Change-Id: I48703535846bbece8dc93ccb5b2742ba3268e60a