Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev
am: c87b15a224

Change-Id: Ib3656593fffaf04653e73b919c3178cc9b73ab44