[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am: 9ca4d43922 -s ours

am: f0893a15ab  -s ours

Change-Id: I039631fce137f11a1eb6d65d57f5150b50b73303
This commit is contained in:
Nathan Harold
2018-06-28 16:36:02 -07:00
committed by android-build-merger

Diff Content Not Available