am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit '9e6bad83608bbe5da07d52c764087496a136ad42':
  Don't attempt to launch disabled activities in smoke test.