[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597  -s ours
am: 22119eeda8  -s ours

Change-Id: I308920bf6b371c4f7b690f3066092a2bd5fb1db7