Merge "Specify `stubs_type` property in java_api_library modules" into main am: 509fa1c6 am: ff78855f

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



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

Merge "Remove one duplicate comparison from OutputConfiguration#equals" into main am: 1af4d7bf am: ca0cbb96

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



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

* changes:
  Add package monitor
  UsbService: Refactor enableUsbData() for multiple disable requesters

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



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



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

* changes:
  Revert "Introduce RingtoneSelection for carrying ringtone preference information."
  Revert "Refinements to initial RingtoneSelection."
  Revert "Flag RingtoneSelection.Builder with FLAG_HAPTICS_CUSTOMIZATION_ENABLED"

Merge "Change the wording of getNumber() API documentation in the SubscriptionInfo class to make, the requirements and return value more clear." into main

Bug: 325302429
Test: play youtube video and then go on lockscreen.
Flag: ACONFIG com.android.systemui.compose_lockscreen DEVELOPMENT

Change-Id: I8ca3c59c851adb694d461c16dd4e5b7808f9be87