[automerger skipped] Merge "Do not preload java.util.ImmutableCollections." into udc-dev am: fb818bed -s ours am: 0e400c28 -s ours

am skip reason: Merged-In I3f1f4b4d56f37495914be1967cf83bd138354e2f with SHA-1 8eea30b6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21989462



Change-Id: I8c2dfe8037a3db8f96f9fd34cb9bfa5556b87c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>