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

[automerger skipped] Merge "Fix unique identifiers best practices links in device ID API docs" am: 8b6aa74d am: 1d8a35f6 am: 33035121 am: 3c6a3316 am: ec0846ea -s ours

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

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

Change-Id: I6686f6aa40b97c2cb5dc5f11d4fb4f14f1834af5