Merge tag 'android-12.0.0_r16' of https://android.googlesource.com/platform/frameworks/native into twelve

Android 12.0.0 release 16