Merge the 2019-10-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Fix a memory leak in gatekeeper.

Change-Id: If3760009ba30d79649abb51b2310896fda56105a