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

Change-Id: I8e4b29e00a958c9de57379010b81f416c8bfa046