Merge "std::string from const hidl_string test"
am: dd92847469

Change-Id: Ie45cd650cd74078ec5b05ab248cb9d58848c4bc1