am: 54b4b8fdfc * commit '54b4b8fdfc336b8a4902637e622c3ede879edcde': Use a builder for NetworkSecurityConfig