Merge pull request #8459 from Erikre/erikre-docs-15574039

erikre-docs-15574039

Author: v-stsavell

memdocs/intune/apps/manage-without-gms.md

@@ -8,7 +8,7 @@ keywords:
 author: Erikre
 ms.author: erikre
 manager: dougeby
-ms.date: 12/16/2021
+ms.date: 09/16/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: apps
@@ -33,6 +33,9 @@ ms.collection: M365-identity-device-management
 
 Microsoft Intune uses Google Mobile Services (GMS) to communicate with the Microsoft Intune company portal when managing Android devices. In some cases, devices may temporarily or permanently not have access to GMS. For example, a device might ship without GMS, or the device may be connecting to a closed network where GMS is not available. This document summarizes the differences and limitations you may observe when installing and using Intune to manage Android devices without GMS.
 
+> [!NOTE]
+> These GMS related limitations also apply to Device Administrator management and Android (AOSP) Management.
+
 ## Install the Intune Company Portal app without access to the Google Play Store 
 
 ### For users outside of People's Republic of China
@@ -43,7 +46,7 @@ If Google Play isn't available, Android devices can download the [Microsoft In
 
 Because the Google Play Store is currently not available in People's Republic of China, Android devices must obtain apps from Chinese app marketplaces. For more information, see [Install the Company Portal app in People's Republic of China](../user-help/install-company-portal-android-china.md).
 
-## Limitations of Intune device administrator management when GMS is unavailable 
+## Limitations of Intune management when GMS is unavailable 
 
 ### Unavailable Intune features
 
@@ -76,6 +79,10 @@ The following tasks can require up to 8 hours to finish:
 - Device reset
 - Installation of available line-of-business apps
 
+**Intune app for Android (AOSP)**:
+- Remote device removal
+- Device reset
+
 **Intune Company Portal website**:
 - Device removal (local and remote)
 - Device reset

memdocs/intune/fundamentals/china.md

@@ -52,7 +52,7 @@ Because the China services are operated by a partner from inside China, there ar
   - Google Play Protect capabilities such as SafetyNet device attestation.
   - Managing apps from the Google Play Store.
   - Android Enterprise capabilities. For more information, see this [Google documentation](https://support.google.com/work/android/answer/6270910?hl=en).
-- The Intune Company Portal app for Android uses Google Mobile Services  to communicate with the Microsoft Intune service. Because Google Play services isn't available in China, some tasks can require up to 8 hours to finish. For more information, see this [article](../apps/manage-without-gms.md#limitations-of-intune-device-administrator-management-when-gms-is-unavailable). 
+- The Intune Company Portal app for Android uses Google Mobile Services  to communicate with the Microsoft Intune service. Because Google Play services isn't available in China, some tasks can require up to 8 hours to finish. For more information, see this [article](../apps/manage-without-gms.md#limitations-of-intune-management-when-gms-is-unavailable). 
 - To follow local regulations and provide improved functionality, the Intune client experience (Company Portal app) may differ in China.
 - Fencing isn't available.
 - Mobile Application Management (MAM) availability is conditional on those apps being available in People's Republic of China.

memdocs/intune/fundamentals/intune-endpoints.md

@@ -119,7 +119,7 @@ Depending on how you choose to manage Android devices, you may need to open the
 
 > [!NOTE]
 > Because Google Mobile Services isn't available in China, devices in China managed by Intune can't use features that require Google Mobile Services. These features include: Google Play Protect capabilities such as SafetyNet device attestation, Managing apps from the Google Play Store, 
-Android Enterprise capabilities (see this [Google documentation](https://support.google.com/work/android/answer/6270910)). Additionally, the Intune Company Portal app for Android uses Google Mobile Services to communicate with the Microsoft Intune service. Because Google Play services isn't available in China, some tasks can require up to 8 hours to finish. For more information, see this [article](../apps/manage-without-gms.md#limitations-of-intune-device-administrator-management-when-gms-is-unavailable).
+Android Enterprise capabilities (see this [Google documentation](https://support.google.com/work/android/answer/6270910)). Additionally, the Intune Company Portal app for Android uses Google Mobile Services to communicate with the Microsoft Intune service. Because Google Play services isn't available in China, some tasks can require up to 8 hours to finish. For more information, see this [article](../apps/manage-without-gms.md#limitations-of-intune-management-when-gms-is-unavailable).
 
 ### Android (AOSP)