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

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



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