Merge "Turn on enforcing mode for Q-based location APIs" am: 5bc4949f3f am: 7407647336
am: 2dadf15165

Change-Id: I85e0f8f0d637554de609d3b80ab5ab1e4a64afec