Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821

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

Change-Id: Ic9f02f2c7b60b131194896fd841cc27aff23c686