keymaster: old ion heap mask must be used for all non AOSP QCOM devices

This fixes wrongly changed https://gerrit.omnirom.org/#/c/10998/

Change-Id: I8422da16b2ff658bbd7442c8a2895a19543ea829