[automerger skipped] Merge "Fix build error due to null annotations in core...

[automerger skipped] Merge "Fix build error due to null annotations in core platform API" am: 9234c21f am: 865efafc -s ours am: a655f680 -s ours am: dd9d4ff9 -s ours

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

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

Change-Id: If85547d09b781595769dd3aaa531e3a93b7b174e