From 702e14bdcf816bf6be42ca878e92cbe2c8d609bf Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Wed, 29 May 2024 10:00:19 +0000
Subject: [PATCH 1/2] Switch makefile owners to MK_OWNERS

Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e72b281d89f769d2cf5000538cd6e9f3793b983c)
Merged-In: I6259f2fb9e561ce0ee5a61c9b6abbb745ace9d25
Change-Id: I6259f2fb9e561ce0ee5a61c9b6abbb745ace9d25
---
 OWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OWNERS b/OWNERS
index 4bdbb973..e6ce5d01 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS

From 2a0c178a14ec39dd4fc7a74082746c5e263d514a Mon Sep 17 00:00:00 2001
From: jiangzining <jiangzining@google.com>
Date: Thu, 30 May 2024 15:22:33 +0800
Subject: [PATCH 2/2] [Scone] add BLUETOOTH_CONNECT to SCONE default permission

MBA Approval: b/330640278
Bug: b/343608940
Test: Build and Flash

Change-Id: I5fd9306599e58e9adb51aeea62b5de11c9147217
---
 default-permissions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index d8dc57a1..a6476338 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -80,6 +80,8 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+        <!-- Used by Bluetooth Module to collect bluetooth info -->
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception