Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  [DO NOT MERGE] Fix signedness mismatch and integer underflow

Change-Id: I29cb7795df3a2e09613657ad9bd3c10065ffd38e