Merge "Fix ignored PhotoPickerTest tests" into udc-mainline-prod am: 46dd4aecee

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/26225013

Change-Id: Ie91eac06e1ae1409d91fae50394803ba413dc3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>