Merge "[AAPM] Introduce new Service for Android Advanced Protection Mode" into main