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

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

Change-Id: I619f63e6b4c2741402dfba42e015cf89a056190d