Merge "Perfprofd: Make the service non-oneshot" am: c582965c2b am: e62cae0759
am: e1c217f5f7

Change-Id: Ia9dbd930d9256b62e27ab40dd1afbd601e8a3b76