Merge "Merge "Merge "Backport of backup transport whitelist" into mnc-dev am:...

Merge "Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa am: 600d4f61 am: c69aa838 am: 38a37f33  -s ours" into nyc-dev am: 36a1b38e am: 1964936f" into nyc-mr1-dev-plus-aosp
am: c4e12f30

* commit 'c4e12f30':

Change-Id: I0bd14cd2eb704ff9e9796d85ee87b460b2366e86