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

Change-Id: Id094e7a1734c8de1c40ce630be67b25144bf7813