[automerger skipped] Merge "Updated PreferenceController to enable or disable the preference based on availability status." into pi-car-dev
am: 0fbfe1ec3c -s ours
am skip reason: SHA1 0fbfe1ec3c skipped by user petrcermak

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