Merge "Add a new AIDL API for wifi indoor/dfs channel usage"