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':
  Add property for redacting EXIF model and maker name

Change-Id: I2005d7bb3ee93980085ab99ce83fb37d30e7cc74