Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
am: 998c416213

Change-Id: I352b53ac10fed126a9e585bc1d3de1430a8cff4f