Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce37

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

Change-Id: I0c4af1c01c4057f742f0df77e2e8c8d23eb753d3