Merge "tuner: use typed Map<String, String>" am: 6f3ebef588 am: 150af91f9c am: 8a3b6fc1e6 am: 38bbe2b326 am: 773acea2ff

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

Change-Id: I7178ae0a91a3cf36106152d26be2fb53070eaca4