[automerger skipped] Merge "Fix unique identifiers best practices links in device ID API docs" into rvc-qpr-dev am: 504b2dd50a -s ours am: 7089383466 -s ours
am skip reason: Change-Id I483e0cf4915862254461200deb5d3dc7302bafb4 with SHA-1 17b4bbd270 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12688127
Change-Id: Ifb914cfe1abf003d6269fe38036ba67e269cdb2a
This commit is contained in: