am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

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