Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 9db4384118" into nyc-mr1-dev-plus-aosp