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':
  Cleanup DAP state before installing new OTA
  Fix partition mapping bug

Change-Id: I3e66c5f5ea173e673eef6fdf3a7b316c1ce27071