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

Change-Id: Iaf92a5949c9196d5d4194322e360d114325a4eea