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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica65ce3224b636cf71b69e37ff9f36315e9309f5