Merge "Merge "Adding Intent Redirection for PhotoPicker Intent" into udc-dev...

Merge "Merge "Adding Intent Redirection for PhotoPicker Intent" into udc-dev am: e3cc21a6 am: c2b87bb3" into udc-d1-dev-plus-aosp am: 387e2edf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22712601



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