[automerger skipped] Merge "Replace...

[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 605740e9 am: d5d37840 -s ours am: 5f08ff59 -s ours am: 4b709ca3 -s ours

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

Change-Id: I148096537c77d2c5fd7a32c97f277a08bebbf5c6