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

Change-Id: Id950409553599bda804d77df81b598b20484a99a