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

Change-Id: I3c26da2760b4df6752330d621544b8b7a346f9c6