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

Change-Id: Ie64c773351594a8925d32b5513e912418bcf35d7