Fix for incorrect model version info

In a number of cases, the model version info was not set correctly,
resulting in incorrect model version information (always 0) being
logged.

Bug: 69240688
Test: Manually tested that the logs are correct. (Both with only factory and only update model)
Change-Id: I89e88635eecd4e4a3f299b2cf5cdd09d6ff53bdf