Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad0b

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

Change-Id: I240a5b08c27aa30a5518f784dd4db8e2abb25e7c