Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c716782 am: 58620b4e am: c48195b3

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

Change-Id: Ice836f2fb51c1193e3bdcd377eecece4cc859070