[automerger skipped] Disable companion and car mode role in role manager adapter am: 8bfba76cf2
am: 2d05f8db63 -s ours
am skip reason: change_id I01f02a36238a2038bfb1b9412e67f786ca002acf with SHA1 bd288490c6 is in history

Change-Id: I3f00d1d4f01487c9c72f219746fd8850b611b876