Merge "Fix hasUseBackgroundNetworksPermission issue." am: 85e8fd5a24
am: e0ddf49e0b

Change-Id: I8b03c9e23ffc9ff46264d6307fb841a7eda76a76