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 'd121e03ca26a0f057ee2eaa2bfd6764cecef0924':
  Update Android CTS bandaid urls that use test_key1 to a new key