Merge changes from topic "am-8b81684be472407f8b1952183b48d71d"

* changes:
  Merge changes Ifa1db027,Iea9699a4 into android13-tests-dev am: c34b9857eb
  Run PhotoPickerTests only for supported hardware am: d1441f07cb