[automerger skipped] Protect system APIs based on feedback. am: 4c1ac0a7 -s ours am: eb4758be -s ours

am skip reason: Merged-In I34b1a3121334fb14b0292c48d6a589a1bb73e629 with SHA-1 9247108c is already in history

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



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