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

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

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



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