Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:

Change-Id: I9541085ce5310f72cfbbd72352768e891055e877