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

Change-Id: Iedfd745699cd937c54e345fe7c0d9dc35052afe8