Merge "Fix admin enable/disable of Bluetooth file sharing" into tm-dev am: c001bc5f

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



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