Merge changes Id4ac3552,I2068f6f4

am: 48284512

Change-Id: I3096c5d0871872de5484f862f9f9878d6a8fce13

vendor/hal_sensors_default.te

@@ -6,5 +6,11 @@ init_daemon_domain(hal_sensors_default)
 
 allow hal_sensors_default fwk_scheduler_hwservice:hwservice_manager find;
 
+# Allow sensor hals to access and use gralloc memory allocated by
+# android.hardware.graphics.allocator
 allow hal_sensors_default hal_graphics_allocator_default:fd use;
 allow hal_sensors_default ion_device:chr_file r_file_perms;
+
+# allow sensor hal to use lock for keeping system awake for wake up
+# events delivery.
+wakelock_use(hal_sensors_default);