Merge "Add pixel-display interface am: 2575315799 am: 7fd0e6a871" into rvc-qpr-dev-plus-aosp