Merge "Automatically grant location and body sensors permissions to system packages that handle the com.android.fitness.TRACK intent." into cw-f-dev
am: 90e57bc278

Change-Id: I71316eeaef6dc0dacecc1567bcf09aff358208bd