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

Change-Id: Ie8dab6648d55ac488905e24a3e1bf58c2c1357c9