Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Fix integer wrap sanitisation. am: 61e10c9c53 am: 5a3e448a22

Change-Id: I72baffb6ff992a78be5407e71d90bfdc74a11f27