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

Change-Id: I2e577b36fbc50f7df92d1e0aad9e837219944597