Merge "Add device settings service and aidl definition" into main