Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev am: 7db56af8f9
am: 5288d90af8

Change-Id: I3e9c8ea4f0a5390dd2b8541493d357ad67dee21b