Merge "Change @DialerComponent to @IncludeInDialerRoot and turn on @IncludeInDialerRoot in root component generator."
am: 3f801a8d28

Change-Id: I0102de379e858bad982f8caaff71b6f83e257c15