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

Change-Id: I4817233aedd593dff62b4f8b4d41fa08cd4c5dd7