Merge changes from topic "cf-message-versioning"

* changes:
  Make MessageVersion constexpr
  Allow setting AndroidKeymaster message version