[automerger skipped] Merge "Updated PreferenceController to enable or disable the preference based on availability status." into pi-car-dev am: 0fbfe1ec3c -s ours
am: 99957a5b8a

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