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

Change-Id: Id48ac0e29a62e17495ae0ae7f4b5741e89e93121