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

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

Change-Id: I2c05f2648326d2350c3bc377c8ead16e7ec9e828