Merge "Stats: new sepolicy for the AIDL service" into sc-dev