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

Change-Id: I54b4c3268878a10583dc6a4cf07f07588f0ca6cf