Merge "Improve dumpsys logs for NetworkProvider and NetworkOffer"