Merge "Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: d4056a279d" into nyc-mr1-dev-plus-aosp
am: 373cbac7ad

* commit '373cbac7ad0b0040cf52930bf8177cfe6c343fa0':

Change-Id: Iaad6f95b1861dcb0c50bcd74ba06e7b8383ee48d