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

Change-Id: I639c521a1d659a3c0f83e16b248b37d68ac15567