Revert most of the message versioning update. am: 7113040462 am: 21d13bd4bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92a86bd92c3531b0bda14d145b671c6cf481e7f0