Merge "Add displayservice." into oc-dev am: 4820c84197
am: b9a84e400b

Change-Id: I560b3198db69ca69952ec04c150d7de39b5bbbc7