Merge "Merge "Make DefGrantPolicy always grant ALWAYS_LOCATION" into qt-dev am: 637600ce am: f0351a9a" into qt-r1-dev-plus-aosp