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

* security-aosp-nyc-mr2-release:
  Fix type confusion in libpac

Change-Id: I324ffcda1f81da809a7596777707a9c01aaf39da