Merge "dumpsys: remove usage of String16::std_string"