Merge "[Vendor] Add filegrouop for NonNull.java" into pi-dev-plus-aosp