am 13277670: am 1b0680e2: Merge "Make android.security.cts.BrowserTest work again." into klp-dev

* commit '13277670e7cc58611b96036c4762d3149b7a5c47':
  Make android.security.cts.BrowserTest work again.