Merge "Add @NonNull annotation to CONTENT_URI"
am: 24eac6a4c7

Change-Id: I6dd8cdee36c1288aa68436c4babbe837c4ffc722