Merge "Merge "Consistent version documentation." into sc-dev am: af2d4c8c am: f0f641d2" into sc-v2-dev-plus-aosp am: bd88d7b1

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

Change-Id: I5330675750517744c9c1ab7fb8837aba11dc5419