am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit '7c22f6d9a2e9e1145a214c4eb5a0b94eecea2d84':
  Update Android CTS bandaid urls that use test_key1 to a new key