Provides SdkTestCore/test_core_current sdk_version for non-updatable
modules that have their test scope dependent on test apis from
framework-minus-apex.

Ignore-AOSP-First: Change in topic with internal-first projects
Bug: 289776578
Test: m checkapi

Change-Id: I855346c01bb609e81b14dbdc13330315badc339e

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 04c1ae14 am: 5f48e533 -s ours am: 47a9332f -s ours am: 159ad295 -s ours am: 24afc9eb -s ours am: f279d88e -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e7 am: 95f88ce4 am: 2363837e -s ours am: 55e15d76 -s ours am: a22d88f8 -s ours am: 75a09fad -s ours am: 47376ea6 -s ours

am skip reason: subject contains skip directive

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



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



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

Merge "Merge "Use announceForAccessibility to workaround Talkback rate-limitation" into udc-d1-dev am: cb7d38e2 am: baf56acd" into udc-qpr-dev-plus-aosp am: 18cda114

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



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

Merge "Create asyncImpl of setData for Messaging and Conversation Layouts" into udc-qpr-dev am: 571bf812 am: d2b7df08

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



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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 04c1ae14 am: 5f48e533 -s ours am: 47a9332f -s ours am: 159ad295 -s ours am: 2e09a74f -s ours am: 59bc599d -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e7 am: 95f88ce4 am: 2363837e -s ours am: 55e15d76 -s ours am: a22d88f8 -s ours am: 6a786dd8 -s ours am: b1188d8a -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Represent hidden classes' subclass definitions in partial signature files" into udc-dev-plus-aosp am: 9bfcfeaf am: 45bcc502 am: c6712459 -s ours

am skip reason: Merged-In I0f9e0720b19ed8fec6d7fa77be97d565d1dd1f16 with SHA-1 02816e3f is already in history

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



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

Merge changes from topic "am-6558352ede11458480664f3efb34ecb9" into udc-d1-dev-plus-aosp am: 73400d5d am: 7e262d64

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



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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 53692d21 -s ours am: 475e4a24 -s ours am: 9efcf576 -s ours am: faf432c2 -s ours am: c61945ec -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 53692d21 -s ours am: 475e4a24 -s ours am: 9841afed -s ours am: 0b846b22 -s ours am: a7091241 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e7 am: 839b9076 -s ours am: 3b3c2e44 -s ours am: cd3cd029 -s ours am: bf651e1a -s ours am: 1438df7b -s ours

am skip reason: subject contains skip directive

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



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

Avoid the possibility of showing up duplicate suggestions with preferPCC.
If the dataset is being picked up because the type is detected by the PCC,
include other fields specified by the provider too (only if those autofill
id's aren't detected by the PCC)
This also removes empty datasets being created during processing.

Bug: 293313411
Fixes: 295184051
Test: atest CtsAutoFillServiceTestCases
Change-Id: I4a82d19350fe02ad5758682ba4d5535908a9a14a

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



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

Merge "HeadsUpManagerTest: Improve and add test cases" into udc-qpr-dev am: 105e2708 am: 5381e22a

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



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

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 53692d21 -s ours am: 475e4a24 -s ours am: 9841afed -s ours am: f7690abf -s ours am: 2c16c0dc -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e7 am: 839b9076 -s ours am: 3b3c2e44 -s ours am: cd3cd029 -s ours am: 22ae1b3d -s ours am: f68a6901 -s ours

am skip reason: subject contains skip directive

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



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

Merge "Classify group summaries as a special kind of style" into udc-qpr-dev am: 67f9627b am: 1fc2f4e6

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



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

[automerger skipped] Merge "Add flag for share wifi button." into udc-qpr-dev am: 85125d90 am: 8f6ffcbe -s ours

am skip reason: Merged-In Ia63161f3658cbd6b5c9cca0a3848141d3add6658 with SHA-1 81184020 is already in history

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



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

[automerger skipped] Merge "Fix BAL via notification.publicVersion" into udc-dev am: af132383 -s ours am: ea83ed9f -s ours am: cd4965e9 -s ours am: f2e1143e -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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

[automerger skipped] Fix BAL via notification.publicVersion am: e79cbff7 -s ours am: 7cf2e69f -s ours am: 7d6c8902 -s ours am: 5b5e298a -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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

Merge changes from topic "am-924f2dd44e864177b21162ff778e62b3" into udc-qpr-dev-plus-aosp am: 9c022cde -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 e79cbff7 is already in history

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



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

[automerger skipped] Merge "Fix BAL via notification.publicVersion" into udc-dev am: af132383 -s ours am: 1ad78f8d -s ours am: 4a746093 -s ours am: e6c93994 -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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

Merge "lockscreen.enable_landscape - removed ID from Flag" into udc-qpr-dev am: b89c7a00 am: 0024942e

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



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

[automerger skipped] Merge "Fix BAL via notification.publicVersion" into udc-dev am: af132383 -s ours am: 1ad78f8d -s ours am: 057a51c8 -s ours am: d64e47ac -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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

[automerger skipped] Fix BAL via notification.publicVersion am: e79cbff7 -s ours am: b059154d -s ours am: 884213b5 -s ours am: c0ca67bd -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 8d839e49 is already in history

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



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

Merge "Always updateRecording in ContentRecordingController#setContentRecordingSession" into udc-qpr-dev am: 6f729037 am: a5a91767

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



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

Merge "Add logs to identify more virtual display error states and media projection stop states" into udc-qpr-dev am: e729480e am: 4ddc45d3

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



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

Merge "Set top and bottom of lock icon to be global rect." into udc-qpr-dev am: 8a820a9c am: 3a837678

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



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

Merge "[Status Bar] Display notif icon area during HUN even in lights out mode." into udc-qpr-dev am: 0911171b am: 3f199751

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



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

Merge "Landscape PIN bouncer: layouts + code for landscape Pin bouncer" into udc-qpr-dev am: 4a12387b am: 2b3f676d

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



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

Merge "Skip pulsing while showing the face scanning animation" into udc-qpr-dev am: bb317e0a am: a7a07363

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



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