Merge "Stats: added registration for AIDL version of the service" into sc-dev