Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676 am: 8cddb920b5 am: 2146f7ef42
am: 467d3b75e8

Change-Id: I4abeafb747d5f0798eec21e6244482ebc94a4c67