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

* security-aosp-nyc-mr2-release:
  Fixes a double free in ContentEncoding
  Check there is only one settings per ContentCompression

Change-Id: Ie6c576b0d7a31c6599cfda4ca717bc7c41d083cc