Merge "Merge "Emulator-ATV: Increase SdkSetup HOME intent priority" into nyc-dev am: 981982fd0c am: 251de1f22e" into nyc-mr1-dev-plus-aosp