Merge "Add capability for sensor hal to use wakelock" am: 2adf343f57
am: b3698f066c

Change-Id: I1d6efc60465540add24fe8808a779a77d665e7af