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

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



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