Merge "Merge "Remove unused methods from LinkProperties." am: ec3a0131 am: cc7d3d97 am: b4f637d3 am: c7c6d5ab" into mainline-prod am: 4aa8adb0

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

Change-Id: I46718037b41181e32d2749ab4620020efc403f21