Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
am: c69aa838a8

* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
  Backport of backup transport whitelist

Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365