Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b am: c6a9f2e81c am: 48cecd59d5 am: d9f8d109dc

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

Change-Id: I1c234ba5a3d2797c9724a7325291624e69c35d47