Merge "Add default code reviewers in displayservice" am: 823b04239c am: 081f76e168
am: f53f4ed3b6

Change-Id: Ie583751e6610c900e1fd44e420278d1fdeb6ea17