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

Change-Id: I4b4c521d80df2eff191ca3c0dec233f464e279e0