API council has requested that the recently added BroadcastOptions
APIs be modified to better match API guidelines.

Bug: 267646347
Test: treehugger
Change-Id: Ia466a1a3428fa25b6e677bbf29bad0c74e469f54
Merged-In: I28456b5f1e155cef1e8fc3f4f9f500c9d8dc26f4

Test: m and TH

Bug: 268337234
Merged-In: Ib58f736ce43d877d0c08cdd9b154e93a1766105b
Change-Id: I7b68602b92f011a3c3da068389cae7bb76bae6e2

* changes:
  CachedBluetoothDevice: Add tests for connect fail
  CachedBluetoothDevice: Fix merge conflict
  CachedBluetoothDevice: Fix detecting connect fail
  CachedBluetoothDevice: Add missing LeAudioProfile

This piece is fast enough to run in presubmit group instead of presubmit-large

Change-Id: Ia7537d4fdcbc5880e2cbacf5b41f414beeb698b0
Test: presubmit
Bug: 270214959

Change-Id: Ie97c16d619ccbab3bc961331f6695d95eef80643
Test: n/a
Bug: 271473168

Some HCE supported functions return UnsupportedOperationException
when they were called by HCE only devices. Add the condition to
fix the issue.

Bug: 267846276
Test: Run "Screen off HCE Payment" with CtsVerifier and see if it will
crash

Change-Id: Ibdacf947dcfc9e57015a03e38b836745b7353713
Merged-In: Ibdacf947dcfc9e57015a03e38b836745b7353713

* changes:
  [automerger skipped] Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0b" into android12-tests-dev am: dcf85bf1" into android12L-tests-dev am: 9a4ae94a" into android13-tests-dev am: 56db2228 -s ours
  [automerger skipped] Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0b" into android12-tests-dev am: dcf85bf1" into android12L-tests-dev am: 9a4ae94a am: b1bfb935 -s ours

[automerger skipped] Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0b" into android12-tests-dev am: dcf85bf1" into android12L-tests-dev am: 9a4ae94a" into android13-tests-dev am: 56db2228 -s ours

am skip reason: Merged-In I72b11d6a1f180c44565b50f3f4e8d2673fde3fec with SHA-1 00234600 is already in history

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



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

[automerger skipped] Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0b" into android12-tests-dev am: dcf85bf1" into android12L-tests-dev am: 9a4ae94a am: b1bfb935 -s ours

am skip reason: Merged-In I72b11d6a1f180c44565b50f3f4e8d2673fde3fec with SHA-1 00234600 is already in history

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



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

Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0b" into android12-tests-dev am: dcf85bf1" into android12L-tests-dev am: 9a4ae94a" into android13-tests-dev

* changes:
  Added default voice/data/sms subscription support
  Add new carrier config to record the default preference setting

Bug: 268587046
Test: atest CachedBluetoothDeviceTest
Change-Id: I3af271d0a67fa38fa1225f77fb76a6b5f855760b

Bug: 268587046
Test: atest CachedBluetoothDeviceTest
Merged-In: I9c50a7b759b7fbcd80f1f5706909ce0a6ddc5959
Change-Id: I46df1c8b43781dac076bc9a4a9f2ea32d20f6337

Transition from CONNECTING to DISCONNECTED doesn't have to mean that the
connection has failed. Add check to verify that connection policy for
profile is ALLOWED and only then trigger connection failed.

Setting connection failed results in "Problem connecting." in Bluetooth
connected devices UI.

Bug: 268587046
Test: BluetoothInstrumentationTest
Change-Id: I1eb116e4ae1735fafe3d7f35fc0bf51d21cb87d3

4 merged_txts targets will be generated for a combined_api target

Test: api_conversion_test.go and TH

Bug: 267600251
Change-Id: I8ec4a1073538c394a7eef896d8f6e354986fa2cd

Added subscription manager service support in
MultiSimSettingController. Also added several APIs in
SubscriptionManagerService.

Test: atest SubscriptionManagerServiceTest MultiSimSettingControllerTest
Bug: 239607619
Merged-In: Ibadbf98093a5444f9942ad51384d611c99de15a3
Change-Id: Ibadbf98093a5444f9942ad51384d611c99de15a3

Bug: 239607619
Test: atest SubscriptionManagerServiceTest
Merged-In: Ic1cc924f7af934501a772323cb5e945cd5d88fe6
Change-Id: Ic1cc924f7af934501a772323cb5e945cd5d88fe6

Some carriers need to disable the VoNR setting as default, so
introduce new config “vonr_on_by_default_bool” to control this requirement.

Bug: 237621350
Test: manual
Change-Id: Idaa9cfb1739f8261e9a4697eae30b7f4e16241c7
Merged-In: Idaa9cfb1739f8261e9a4697eae30b7f4e16241c7