Merge tag 'android-security-12.1.0_r7' into staging/lineage-19.1_android-security-12.1.0_r7

Android Security 12.1.0 Release 7 (12937443)

* tag 'android-security-12.1.0_r7':
  servicemanager: set consistent flags for self-reg

Change-Id: I8b5f67ead7ef9add0e2e79348c47bc0a84f252e3