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

* security-aosp-nyc-mr2-release:
  Remove potential double free

Change-Id: I033ef38abe5803f766320221198a2ab8d728416a