Merge tag 'android-security-13.0.0_r29' into staging/lineage-20.0_android-security-13.0.0_r29

Android Security 13.0.0 Release 29 (13218412)

* tag 'android-security-13.0.0_r29':
  [CDM] Checks NLS component name instead of package name
  Add biometric authentication for package modification

Conflicts:
	src/com/android/settings/Utils.java

Change-Id: I3c1f3d67a8fffcc6244f7e43cefc6fd07c50ca31