Merge "Fix test environment setup to run setup Activity explicitly." into pi-car-dev
am: 99a13ea14c

Change-Id: Ia5982399fd455f17195b429454433121deb9b24b
tree: a724f546b740049b57cf695e294bd7f883592939
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg