Merge cherrypicks of ['googleplex-android-review.googlesource.com/28102879', 'googleplex-android-review.googlesource.com/28104901'] into 24Q3-release.

Change-Id: I392e4607a00ecaa819fbc18fedac251ea3d9772c

device.mk

@@ -275,11 +275,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Pixel Logger
 include hardware/google/pixel/PixelLogger/PixelLogger.mk
 
-# RIL extension service
-ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
-include device/google/gs-common/pixel_ril/ril.mk
-endif
-
 # Use Lassen specifc Shared Modem Platform
 SHARED_MODEM_PLATFORM_VENDOR := lassen
 
@@ -1207,6 +1202,13 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 # UFS: the script is used to select the corresponding firmware to run FFU.
 PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# RIL extension service
+ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
+include device/google/gs-common/pixel_ril/ril.mk
+endif
+endif
+
 SUPPORT_VENDOR_SATELLITE_SERVICE := true
 
 # Telephony satellite geofence data file

overlay/packages/apps/Settings/res/values/arrays.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- Packages that will not show Display over other apps permission -->
+  <string-array name="display_over_apps_permission_change_exempt">
+    <item>com.google.android.apps.scone</item>
+  </string-array>
+</resources>