fixup! FP4: Make device name/product prop overrides work

Description

fixup! FP4: Make device name/product prop overrides work

Issue(s)

https://gitlab.e.foundation/e/devices/backlog/-/issues/488

Test environment

• Make a build with the following parameters:
  • DEVICES: FP4
  • BRANCH_NAME: v1-s
  • FEATURE_BRANCH: 488devices-s-FP4_override_name2
  • ENG_BUILD: false

Test Procedures

• Verify ro.product.system.name is set to FP4eea

Check list

• Self review
• Test procedure explained
• Tested on fresh install
• Tested applied as an update
• License
• Internal documentation
• User documentation