Merge "Fix permission bypass problem for Tethering deprecated APIs" into tm-dev