Merge changes from topic "am-c5c0d77045e4406d92e32b2ac9b4a94d" into main

* changes:
  [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868 -s ours am: fe3023d496 -s ours
  [automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111 -s ours am: ac425a05cb -s ours