Merge "Do not preload java.util.ImmutableCollections." am: 2f18344d98

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

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