Merge "Make TetheringManager to system API"