Merge "Remove unnecessary imports and defaults from PowerAdvisor AIDL interface" into main