Merge "Expose applyTunnelModeTransform as a system API"
am: d056f32bd9

Change-Id: Ibebf4d53bc6b22cb32a23720f0b09e24de5e704b