Merge "Consistent version documentation." into sc-dev am: af2d4c8c8f

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

Change-Id: Ia258cc5ac7a7bd4887422eb0a4d57f9c22fa5ae1