Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1

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

Change-Id: Ib53ff4dbcc1d341f92d3550495cc91cff5890844