Merge "Support special tethering and removed apps UID in the usage list" into tm-dev