Merge "Make DefGrantPolicy always grant ALWAYS_LOCATION" into qt-dev
am: 637600ce76

Change-Id: I2bbe6a878f70f0d4a11a72a0a096e2454e62bbcb