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

Change-Id: I5bbc816a59c8155a89109d8cc77dd4bd1536bd2a