Android 12.0.0 release 27
Merge remote-tracking branch 'aosp/upstream-main' into master am: 072dce8ca5 am: bcf1f249f1 am: eebbf2e2b4

Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1673705

Change-Id: I430a839193d1532b4d541a388e2a1c2be9a30f69