Fix admin enable/disable of Bluetooth file sharing, part 2 am: 2b77cce5 am:...

Fix admin enable/disable of Bluetooth file sharing, part 2 am: 2b77cce5 am: f483e652 am: e5578b99

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



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