Merge "Disable com.android.yadayada before running CTS" into nyc-dev
am: 85e6f3f577

* commit '85e6f3f57753710c3e0057eb75cf8c781925e9f6':
  Disable com.android.yadayada before running CTS

Change-Id: I613ab0a787bf619b7b7a30589c94e2257c4610d6