Merge changes from topic "am-5bc0e86de1b2482d86b2ab91b73fe9b9" into android12-tests-dev

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Disable HARDEN_BRANCH_PREDICTOR test for kernels >= v5.10" into android11-tests-dev am: 6c4eba2cf4 -s ours
  [automerger skipped] [DO NOT MERGE] Disable HARDEN_BRANCH_PREDICTOR test for kernels >= v5.10 am: c3f0e53cd6 -s ours