Merge "Move the Thread proguard flags to ConnectivityService's proguard.flags" into main