Merge tag 'android-13.0.0_r16' into int/13/fp3

Android 13.0.0 Release 16 (TQ1A.221205.011)

* tag 'android-13.0.0_r16':
  Protect against malformed grantors

Change-Id: I25656f67f0b652442c45b8d1bbd3a3f5b5a22db0