Merge changes from topic "reorganize_intent" into pi-car-dev

* changes:
  Add a couple more intents that were missed
  DO NOT MERGE Reorganize intents to have the same order
tree: 52a37b726e31b7b1018e52ca615f96ba18f2f52a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg