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

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

Change-Id: I3522b1a5b94de302fbe1ee70949ecd7a4a3f9963