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

Change-Id: I1f281d33b83c43ebe155549ee8847dd4cf84a942