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

* commit '1b0680e2b9ad6eee8b5e75011b30d34c8c6dbd39':
  Make android.security.cts.BrowserTest work again.