Merge changes from topic "am-e264b27cf73f43018d2f4f3446c34312" into main

* changes:
  [automerger skipped] Merge "Add "com.android.btservices" to 'apex_available' property of "android.os.flags-aconfig-java-export"" into main am: ccad2d8f -s ours am: 8e1671a7 -s ours
  [automerger skipped] Add "com.android.btservices" to 'apex_available' property of "android.os.flags-aconfig-java-export" am: 8e557c67 -s ours am: 27e45f42 -s ours