Merge "Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e844 am: 88e7e04e am: 55caa6f6 am: c30061fd" into rvc-qpr-dev-plus-aosp