Merge "Copy message_version_ in the AndroidKeymaster move constructor" am: 44ed723c4b am: cc39e06f3a

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1851053

Change-Id: Ib3555135bcaf46db3c7dc93ce23bfb69a79da253