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

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

Change-Id: Ic5436a57c8a7e2fc32d9cecf76376c10d5a9c8a0