Merge "Add fwk_display_hwservice." into oc-dev am: ffb8fb1b94
am: c1ee74ffb4

Change-Id: I0fcc76515b3923c542d5d39cd14734dc333c010c