Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a7470e am: 82e4d3638c am: fd1c39231f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa42de207124ca9e8646324cd4b57834c341ad6