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

Change-Id: I08ef057e8e889f170b6e9e325e169357cf4b0a26