Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d am: 88e7e04e61 am: 55caa6f60f am: c30061fd5f
Change-Id: Icd646d091c9affa4129c745e03b398e54d508192
This commit is contained in: