[automerger skipped] [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull am: 232b2edcfb am: adf6c4eaff am: f68f1f383d -s ours
am skip reason: Change-Id I42117ebfb640e3b0b133183e5e146860bed8471a with SHA-1 0af97d60d7 is in history

Change-Id: I35ac1c3ffadff900139fc5dc2049eed3524a43af