Merge "Expose applyTunnelModeTransform as a system API" am: d056f32bd9 am: c2253ff48d
am: 9aaff41725

Change-Id: Ia1f81f5696814f5b9479882e1102a5f8508a4512