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: 478283d6" into udc-d1-dev-plus-aosp am: 9f3c517e

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



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