am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
  restorecon /data/media when re-creating it for multi-user upgrade.