[automerger skipped] Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce am: ff7f255c -s ours

am skip reason: Merged-In I2c864a34f356e32948cbc4e5d249e12c691a5726 with SHA-1 8f68089d is already in history

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

Change-Id: I6d22071a6e1e3aba092970fbfb21e88a634bfd69