[automerger skipped] Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev
am: 36846786 -s ours
am skip reason: change_id I38c6f3bf8a8c43997251b1f13b3f2fb4533d15f2 with SHA1 97a29c4a is in history
Change-Id: I0a8e40add311a2dc9ea3b845b7059aa2bfa33755