Merge "Actually use --copy-and-update-profile-key argument in profman..."
am: 29d4cc0097

Change-Id: I29a96875418250ff116b1a8b396a7e64a2d6279e