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

Change-Id: Idab3ef3f74f494a3d852f047088e621b4cc01fc5