Merge changes I9f8abac1,I37523031 into s-keystone-qcom-dev

* changes:
  Merged CtsDisplaytestCases fix to keystone(1/2)
  Cherry pick fix for b/192998815 to keystone