Merge "Add "Launcher" category back for car setting, so it show up on the car facet" into oc-mr1-dev
am: 9aece8f8fb

Change-Id: I50178ef3fb65bea82daf97f7d7c43d71ad273829
tree: 6d0beb5b970b8e8d843899d8f3c0c8c0807e0403
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml