[automerger skipped] Merge "DO NOT MERGE Fix broken tests by removing assumption" into pi-car-dev
am: 3d7611b752 -s ours
am skip reason: subject contains skip directive

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