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

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

Change-Id: Ifd1c48036dbc7f7a48ae24ce13553f71f1eb794c