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

Change-Id: Ibd80a9a3d6336ab5849f46252b231919dcbad3a8