Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c716782 am: bc5db398 am: 32309f39

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

Change-Id: I469fcfce9e5a27639cc0d1964ab7f32b800e7d81