Merge "AIDL: use typed Map" am: 72d5595e0e

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

Change-Id: I2757de388bfa22023c4a710c4677b04cd049efff