resolve merge conflicts of 16539da232da0c4ffe5fa042a4a7d13d33219a9b to rvc-dev

FallbackAssistant should use equals() not == for Person.

Bug: 150603924
Change-Id: I6f3a1918745ca9f640ea221798e46ca0705ad3d6
tree: a24d9489ababf68f6de24903b616c9a65f3705f0
  1. car-assist-client-lib/
  2. car-broadcastradio-support/
  3. OWNERS
  4. PREUPLOAD.cfg