tree 374fc6bb00c82aba933bd82acde876d822d5dd57
parent 3f0a69162b14132152df9bdf4d9716512db264b1
parent 3acc45694fbe5288846b02f8c1dc67bb7f28bd38
author Hall Liu <hallliu@google.com> 1558729209 -0700
committer android-build-merger <android-build-merger@google.com> 1558729209 -0700

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

Change-Id: I03658b78992969a25b8eccebb820f433d099a966