Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005 Change-Id: I9d6e8649e7f4727dd30dbdb3f9ce153616f8e628