Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c71678253 am: bc5db39866

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

Change-Id: I10f5dffdb14b410eafaae6da1a4a639445b4a00c