Merge "Added unit tests for com.android.server.wifi.hotspot2.Utils.java" into qt-dev