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