Merge changes I19229154,Ie5340261,Ib2f79889 into stage-aosp-master

* changes:
  resolve merge conflicts of I791fa82b54ddd7b2bca26f05409ec830187416c3 to rvc-d1-dev-plus-aosp Bug: 172866897
  Add some keys into proto to unblock my project
  [DO NOT MERGE] [Verifier] Revert DisplayModesTest