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

Change-Id: Iaa6e0dc69aea399f31aa7ae198ea7d17cd7df89a