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

Change-Id: I2392be3559a6bc2052e1ae7b5acfeb5e20ac1415