Merge "Fix build error due to null annotations in core platform API" into rvc-qpr-dev-plus-aosp am: b016acc8c3

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

Change-Id: Iedceb78f447cdaaadf1a816f0ea073c3043d70fa