Merge "DO NOT MERGE: Disable StrictMode VM Policy check. am: f20d333ada" into rvc-qpr-dev-plus-aosp