Merge "cameraservice: Fix ICameraDeviceUser aidl order."