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

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

Change-Id: I7e33663db36e5f2060f222715d90ddfff7b1574c