Merge tag 'android-security-9.0.0_r72' into staging/lineage-16.0_merge_android-security-9.0.0_r72

Android security 9.0.0 release 72

* tag 'android-security-9.0.0_r72':
  Don't attach private Notification to A11yEvent when user locked
  Improve ellipsize performance
  Fix side effects of trace-ipc and dumpheap commands
  Fix race condition between lockNow() and updateLockscreenTimeout

Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/policy/PhoneWindowManager.java
	services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java

Change-Id: I1c3c9e0cb63673d606f81657c5c93c722e6ec147