am b705e3d6: am c73da739: Merge "Revert "Make android.security.cts.BrowserTest...
am b705e3d6: am c73da739: Merge "Revert "Make android.security.cts.BrowserTest work again."" into klp-dev
* commit 'b705e3d6':
Revert "Make android.security.cts.BrowserTest work again."