Merge changes from topic "am-10d5e846b2ae4618a9d8a05bf289339e" into main

* changes:
  Merge changes from topic "am-1e449a28a53e4abfb43063bba3fd36ce" into android15-tests-dev am: e15a359d52
  [automerger skipped] Merge "DO NOT MERGE: Disable Fullscreen Magnification tests on XR as they do not apply." into android14-tests-dev am: db6d2934a6 -s ours am: 7d4bf68c68 -s ours