Merge changes from topic "presubmit-am-acd9b996d012403a892a6de55138b8cf" into tm-dev

* changes:
  [automerge] Enable PhotoPicker tests for test-coverage 2p: 523dbe8bea
  Enable PhotoPicker tests for test-coverage