Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8
am: 38a37f336f -s ours
* commit '38a37f336f96896146efc1a85310504bf4f77116':
Backport of backup transport whitelist
Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
This commit is contained in: