Merge "Developer option crashed when Bluetooth feature disabled" into main am:...

Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8 am: 6190b5eb

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099



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