[automerger skipped] Merge "Save photo picker callback state on activity...

[automerger skipped] Merge "Save photo picker callback state on activity destroy" into udc-mainline-prod am: 5547da50 -s ours

am skip reason: Merged-In Ibbf5466747e999f19e790c3b981976ff6369bb9a with SHA-1 7e885235 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/25806371



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