[automerger skipped] Save photo picker callback state on activity destroy am: 0c01d53e -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: I085e3e291b8f1ca02a45deb07087cd7cc3221ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>