Merge "dumpsys: remove usage of String16::std_string" am: 561b4e5d89 am: a8f36c30d0
am: 250d06bea5

Change-Id: I21f7533d90919a4384f52a3bd5a4976a2cef1d00