Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: edb04b0849 am: 5727033c3a

Change-Id: I77d243d82c34a976637f6bdb8f652e9886c3b491