Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ic16ed5efe7a516333a64adda02c3cc6978890cd8

WCNSS_qcom_cfg.ini

@@ -666,6 +666,10 @@ oce_enable_rssi_assoc_reject=0
 #Timer waiting for interface up from the upper layer
 gInterfaceChangeWait=1000
 
+#Enable Bmps(power save in connected state) based on timer
+#Timer value is in seconds
+gAutoBmpsTimerValue=90
+
 END
 
 # Note: Configuration parser would not read anything past the END marker

self-extractors/extract-lists.txt

@@ -5,6 +5,7 @@
     ;;
   qcom)
     TO_EXTRACT="\
+            system/app/ims/ims.apk \
             system/etc/cne/Nexus/ATT/ATT_profiles.xml \
             system/etc/cne/Nexus/ROW/ROW_profiles.xml \
             system/etc/cne/Nexus/VZW/VZW_profiles.xml \

self-extractors/qcom/staging/Android.mk

@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter taimen, $(TARGET_DEVICE)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ims
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+endif

self-extractors/qcom/staging/device-partial.mk

@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# AOSP packages required by the blobs
+PRODUCT_PACKAGES := \
+    ims
+
 #  blob(s) necessary for Taimen hardware
 PRODUCT_COPY_FILES := \
     vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \