Merge "Merge "Removing possible user defined strings from bugreport view-dump" into rvc-dev am: 31c94a2f am: dabe69fe" into rvc-d1-dev-plus-aosp