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

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

Change-Id: I96c963e60d3c9d8109dc844f0df4ec985447c6fa