Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into...

diff --cc core/java/android/app/ActivityManagerInternal.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActiveServices.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge

diff --cc services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
Simple merge