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

Change-Id: I60391477badc56373f231911aae4172ee8d5cdf0