Merge "Add additional info to device ID docs in TelephonyManager and Build" into rvc-dev am: 3fa2d86fd0

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

Change-Id: I464bd5f8ca393f9df0016de5a5cf176ecafeda28