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

* security-aosp-nyc-mr2-release:
  RESTRICT AUTOMERGE: Always use safe labels

Change-Id: Ic730e65400dd1e9dbaacdacd86c35d2889582c55