[automerger skipped] [DO NOT MERGE]Daggerize Android Auto am: 8d49d0d63f
am: 3e0a59b03d -s ours
am skip reason: subject contains skip directive

Change-Id: I16209dcdf310fdad0cb5966be3179c211b7385d8