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

Android 13.0.0 Release 38 (TQ2A.230405.003)

* tag 'android-13.0.0_r38':
  Prevent falling into OtherActivityInputConsumer when over lockscreen
  Prevent falling into OtherActivityInputConsumer when over lockscreen

Change-Id: I6f30da8346ce246c2239a0a373befe9baf276d01