Merge "Always send BT settings on boot" into tm-qpr-dev am: dbe797351d am: 3a3efb4d97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19196472

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

services/core/java/com/android/server/location/contexthub/ContextHubService.java

@@ -1204,11 +1204,11 @@ public class ContextHubService extends IContextHubService.Stub {
             }
         } else {
             Log.d(TAG, "BT adapter not available. Defaulting to disabled");
-            if (mIsBtMainEnabled) {
+            if (forceUpdate || mIsBtMainEnabled) {
                 mIsBtMainEnabled = false;
                 mContextHubWrapper.onBtMainSettingChanged(mIsBtMainEnabled);
             }
-            if (mIsBtScanningEnabled) {
+            if (forceUpdate || mIsBtScanningEnabled) {
                 mIsBtScanningEnabled = false;
                 mContextHubWrapper.onBtScanningSettingChanged(mIsBtScanningEnabled);
             }