Merge "Set jack.assert.policy value to 'always'" into nyc-mr1-dev-plus-aosp