Merge tag 'android-security-14.0.0_r21' into staging/lineage-21.0_android-security-14.0.0_r21

Android security 14.0.0 release 21

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

Change-Id: If64d13c349e313bcf37346236849a9de4b773d32