Merge "Drop platform_apis in stats aidl" into main