[automerger skipped] Merge "Fix unique identifiers best practices links in...

[automerger skipped] Merge "Fix unique identifiers best practices links in device ID API docs" into rvc-dev am: 52d15e38 am: 77c1ba5a -s ours

am skip reason: Change-Id I483e0cf4915862254461200deb5d3dc7302bafb4 with SHA-1 1aef206a is in history

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

Change-Id: I86c519021b88d4ee287dc5f46545b29accc98637