Merge "Freeze AIDL APIs for SC" into sc-dev