Merge "Revert "AIDL: use typed Map"" am: 01da4566 am: 16c2faf6 am:...

Merge "Revert "AIDL: use typed Map"" am: 01da4566 am: 16c2faf6 am: 161105be am: 2063fecc am: b2fc9a7e

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

Change-Id: I179be8842d9db2f76ac735b7f884600afddf711a