Merge "Verify app links user selection preservation on update" into sc-v2-dev am: 9afe5a6f09 am: badd9853ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16216204

Change-Id: I95f1c3fab9e98f99267506aa48f73fbd46006125