Merge "display_manager_client unused parameter warning fixes" into oc-dev
am: 4267ac38bd

Change-Id: Iee5a1e21ddd2bdf2f083c53134de8e55d9afcfa5