[automerger skipped] Merge "Replace...

[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098dda am: fd749ba3 -s ours am: 90578851 -s ours am: d9039bc7 -s ours am: a04943be -s ours

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

Change-Id: Icc9901c1d50f58b51cfc3ba62939c1c2cb490983