Merge "Revert "AIDL: use typed Map"" am: 01da4566ee am: 16c2faf6e1

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

Change-Id: If93a01cbff96ab90c54bc35fdeb2ac298914df33