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
am: 118d1dec31

Change-Id: I0dfcac7db094b05620f12ee266e3bbc2aa2637a2