Merge changes from topic "catalyst-firmware-version" into main

* changes:
  Migrate Android security update preference
  Migrate mainline module version preference