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

* security-aosp-nyc-mr2-release:
  Merge commit 'b760a3bb' into aug10d-nyc-mr2-dev

Change-Id: I3597b86fa20b733dccdc322cb76ed2d1bcf22f62