[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"

am: 9ca4d43922  -s ours

Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
This commit is contained in:
Nathan Harold
2018-06-28 16:26:56 -07:00
committed by android-build-merger

Diff Content Not Available