[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 605740e928 am: d5d378400c -s ours

am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 ea1a7cad15 is in history

Change-Id: I0186fe6a3dea5c9f955ea12e97c36d9f08b6ffac