Merge "Add AIDL constants to framework constants" into sc-dev