Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev am: 4d96602de0

Change-Id: I5cee427c75ff965fd30861bbff1123b908a47306