Merge "Automatically copy images in MediaPreparer" into oreo-cts-dev am: ced153e33a
am: 0e37fdc3e5

Change-Id: Icab9a80b7ab233b029bd6ca737ed49fd1ed975c5