Always use the same autoloading mechanism for DataModel

This fixes autoload falure in case of running tests via MW where DataModel gets
included via a test bootstrap and not some LocalSettings

Change-Id: I50af027aad9235afd0b0031a7a3dd438bf39c70a
Merge "Always use the same autoloading mechanism for DataModel"