Merge "Emulator: promote SdkSetup app to privileged" into nyc-dev
am: 4d7fcf96be

* commit '4d7fcf96be02255a9bbc62deb21861650429fa3d':
  Emulator: promote SdkSetup app to privileged

Change-Id: I3dcfaba8f9957091f8e1387578bd5d5972039c84