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

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

Change-Id: I3d389166232c0b41e938aee53ae10c1d2df12ad5