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

* security-aosp-nyc-mr2-release:
  Rework thumbnail cleanup
  [DO NOT MERGE] Enforce user separation on external storage

Change-Id: I1d5578318d1981a34f1f1ce657bfa55a2d71615a