Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 am: c311b4859d am: e8d7d82d76

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

Change-Id: I0ac9d8699ce7d19543791ee731d524f95f09071d