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

Change-Id: Ide3bf7d2155e1b17240a5a22da211568aebd923f