Android 12.1.0 release 18
Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 am: c311b4859d

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005

Change-Id: Id88ffd24b071e2faddeea67b522ff665f4c25549