[automerger skipped] Merge "Do not preload java.util.ImmutableCollections."...

[automerger skipped] Merge "Do not preload java.util.ImmutableCollections." am: 2f18344d am: dec6c090 am: 83868c08 -s ours

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

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



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