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

Change-Id: I340cb46f3ccc7ec59176ad43e7b60ad445766b65