Merge "Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a5082 am: 459f2c80" into rvc-d1-dev-plus-aosp