Merge "Adding HAL API for disabling subscription" am: f597a4ae0e
am: 9db4404484

Change-Id: I796d5572d27ff60f170d0ff4aa0c9198636ea0b5