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

* commit 'd1d685b7e5b095aba12f34db4b364279b766955f':

Change-Id: I5fc8c36fff1f5caf80aad5299c4fe2907a08ca59