[automerger skipped] Merge "Remove the resolved path of session's APK from user confirmation intent" into udc-dev am: 7fbad46a am: e14ab158 -s ours

am skip reason: Merged-In Ibe7fe3ab5e74e3e910d9f7bd5b6f3f2e3c0ca658 with SHA-1 7623ac96 is already in history

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



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