Merge "Fix/clean up WebSettingsTest.testAccessAllowFileAccess" into oreo-cts-dev am: 4a3826bd64 am: 1ed637921b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1447076

Change-Id: I20753e0afc0a87156a77fa56808f1e4f0730b47f