Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a50 am: 0b61859b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990



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