Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a508218 am: 459f2c806b

Change-Id: I1b9292eb0e16412ac4bacb20753c9ae426fb042e