Merge "Merge "Set jack.assert.policy value to \'always\'" into nyc-dev am: 1100edb83f am: ce528bba46" into nyc-mr1-dev-plus-aosp
am: 269de9f468

* commit '269de9f46834fed8f331dc9841a3a8c998c7a733':

Change-Id: I023d3b0f6e09495462509e66ab3719cfaa19c40d