Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am: cec2ebf676

Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e