Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts:
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java

core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application>
-        <!--保活用-->
+       <!-- &lt;!&ndash;保活用&ndash;&gt;
         <service
             android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
             android:enabled="true"
@@ -26,7 +26,7 @@
             android:resizeableActivity="false"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
+-->
         <activity
             android:name=".MainLauncherActivity"
             android:clearTaskOnLaunch="true"