Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  Revert "Keep a light version of the SBN around"
  Put notification demotion behind flag

Change-Id: I2272f89db80f663d788071f7e3b1b84a55136729