[automerger skipped] Merge "Fix build error due to null annotations in core platform API" into rvc-qpr-dev-plus-aosp am: b016acc8 am: db11353c -s ours

am skip reason: skip tag Change-Id I83e3071f851720a9f719cb226f0e84fd731a8f37 with SHA-1 34125614 is already in history

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

Change-Id: Ie341fed47d4c9953a4a124cf15c3995302c2a205