Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: 29280addfd am: 4925ffcbec
am: ce7bcb28ff

Change-Id: I9a241d3ecf5c7bee929f42bcba4438a60e36f94c