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

Change-Id: Ib58980c644cb2e654fd5dccc0fd024843a6f3b32