Merge "Change @DialerComponent to @IncludeInDialerRoot and turn on...
Merge "Change @DialerComponent to @IncludeInDialerRoot and turn on @IncludeInDialerRoot in root component generator." am: 3f801a8d
am: ecba5907
Change-Id: Idea4d2627e59617ec7b6b678c889fad9b2962be7