Merge "Add some keys into proto to unblock my project" am: 82ac41516c am: 266b466420

Original change: https://android-review.googlesource.com/c/platform/cts/+/1477637

Change-Id: I6dfa73e45ad0772e8fe80021247070f1ecc0de3b
tree: 175a5250a3fbc20f4314a2508c7115877bf95a56
  1. tests/