Merge "Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f am:...

Merge "Merge "Turn on Webview Overlays" into sc-dev am: a43c6c4f am: c930224c am: 6c998e40" into sc-v2-dev-plus-aosp am: 90c87518

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559504

Change-Id: Id138d483e5bf43d89c69f182232c17ac5dc218c1