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

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

Change-Id: I3e41ec2891d760123e6c78cbdc0b2d06b8be85b3