Revert "Revert "Add feature ids to system server services that requset location.""

This reverts commit 8fe72a21f1eb5c24487c8c93bda1f83e2e493683.

Reason for revert: Fixed issue that caused the revert, now fine for re-submit

Change-Id: Iaaeb9e937e336f4d08d761bf4ce343de0f8acf27
6 files changed