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

Android security 13.0.0 release 30

* tag 'android-security-13.0.0_r30':
  RESTRICT AUTOMERGE parse userId from authority in opp in the same way as ContentProvider

Change-Id: Iaa797dab78e43469bea51d5b829f81d4eebef28f