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

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

Change-Id: Ic9dec9ce6dd18c96e42e9f1ddc1f68ab24a3d6ec