Merge "Merge "Emulator-ATV: Increase SdkSetup HOME intent priority" into nyc-dev am: 981982fd0c am: 4daac254a2" into nyc-mr1-dev-plus-aosp
am: 49df3f151c

* commit '49df3f151c762a3da4b8cfcca44c07923dda03f6':
  Emulator-ATV: Increase SdkSetup HOME intent priority

Change-Id: I61ae3479e048f147ed374793dabfd4ee1f92aff7