Merge "Allow carrier-priv apps to scan with location off" into qt-dev
am: 3acc45694f

Change-Id: I03658b78992969a25b8eccebb820f433d099a966